Auto merge of #1537 - ozmorph:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 19 Apr 2015 01:59:13 +0000 (01:59 +0000)
committerbors <bors@rust-lang.org>
Sun, 19 Apr 2015 01:59:13 +0000 (01:59 +0000)
fixes #1536 .  Tested with rustc 1.0.0-nightly (a52182ffd 2015-04-17) (built 2015-04-17).


Trivial merge